Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 07:15:56 +0000 (23:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 07:15:56 +0000 (23:15 -0800)
commitac2e9131b4223fcc38e49d4e51479a0b75e0945d
tree56c8d3580cd8bde2263a4182b134f6bd1ae74df6
parent41c310346344e3bf38c31b284b6baf635f3f6ac8
parent30dc1d18a72d55d612edb9c189148c6bf02531ca
Merge from trunk.